Try to get cross-compiling working again

diff --git a/debian/control b/debian/control
index b5910a930575ba477605d2975367b72fc9a77d14..94c030e9ed00dc54320cecf091fe2419ed045fa6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,9 @@ Build-Depends: debhelper (>= 9.20141010),
                dpkg-dev (>= 1.17.14),
                python-dulwich           <pkg.cargo.mkstage0>,
                python-pytoml            <pkg.cargo.mkstage0>,
+# TODO: related to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839145
+# the non-native lines can be deleted after all versions in unstable are M-A: allowed
+               cargo           (>= 0.17.0) <!pkg.cargo.mkstage0> |
                cargo:native    (>= 0.17.0) <!pkg.cargo.mkstage0>,
                rustc:native    (>= 1.16),
                libstd-rust-dev (>= 1.16),

diff --git a/debian/install b/debian/install
index a1ad6e4ffdf53403785938e7ec13bb345683994d..5245675046655fca482bbe294370da9777bdea23 100644 (file)
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,2 @@
-target/release/cargo                    usr/bin
+target/*/release/cargo                  usr/bin
 debian/scripts/*                        usr/share/cargo

diff --git a/debian/rules b/debian/rules
index ec8da18a5819eeb1704535b5bf8249e0bf8a4b63..167c903bb3f70c710f4727ff5db19865fe70ca5a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ RUSTFLAGS += $(foreach flag,$(LDFLAGS),-C link-arg=$(flag))
 export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS RUSTFLAGS
 
 CARGO = RUST_BACKTRACE=1 cargo
-CARGOFLAGS = --release
+CARGOFLAGS = --release --target=$(DEB_HOST_RUST_TYPE)
 # Cargo looks for config in and writes cache to $CARGO_HOME/
 export CARGO_HOME = $(CURDIR)/debian/cargohome
 # Ask cargo to be verbose when building